testsuite: Update tools tests

These tests need to test GTK4 ui file syntax.

diff --git a/testsuite/tools/simplify-data/test1.expected b/testsuite/tools/simplify-data/test1.expected
index de1472e5cdc2cb09325cd73e873ff13efc729499..23509c82374d58c9bd2e065ecc4ec0e2dce94dc2 100644 (file)
--- a/testsuite/tools/simplify-data/test1.expected
+++ b/testsuite/tools/simplify-data/test1.expected
@@ -1,5 +1,4 @@
-<!-- default property gets stripped -->
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <object class="GtkWindow">
-  </object>
+  <object class="GtkWindow"/>
 </interface>

diff --git a/testsuite/tools/simplify-data/test2.expected b/testsuite/tools/simplify-data/test2.expected
index 99fefb9511818a7b6e02e74df94e8ab999291719..0bb3f4e18b42dbf1ab9dba01983c1cc9ff41a5b2 100644 (file)
--- a/testsuite/tools/simplify-data/test2.expected
+++ b/testsuite/tools/simplify-data/test2.expected
@@ -1,4 +1,4 @@
-<!-- non-default property not stripped -->
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow">
     <property name="visible">1</property>

diff --git a/testsuite/tools/simplify-data/test3.expected b/testsuite/tools/simplify-data/test3.expected
index 6b9c07f163427c10608d0b7b1e2ed99cbe57bfd7..511e7ee76bb8e06e53d7dcb37bd549e9689ddf90 100644 (file)
--- a/testsuite/tools/simplify-data/test3.expected
+++ b/testsuite/tools/simplify-data/test3.expected
@@ -1,4 +1,4 @@
-<!-- translatable property not stripped -->
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow">
     <property name="visible" translatable="yes">0</property>

diff --git a/testsuite/tools/simplify-data/test4.expected b/testsuite/tools/simplify-data/test4.expected
index 286f1062ec48de718cb856d8bfcaa20670d5463a..be8d6b5981ca21572c79e261e1dbce653545a359 100644 (file)
--- a/testsuite/tools/simplify-data/test4.expected
+++ b/testsuite/tools/simplify-data/test4.expected
@@ -1,6 +1,6 @@
-<!-- irrelevant comments and context are stripped -->
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow">
-    <property name="visible">1</property>
+    <property name="visible" comments="foo" context="bla">1</property>
   </object>
 </interface>

diff --git a/testsuite/tools/simplify-data/test4.ui b/testsuite/tools/simplify-data/test4.ui
index eb5b0f0ea617de43d1b3e1b1d08e7b818318c430..cf9c66b091410d1b2f8ba24a21d7511ba6ae80c5 100644 (file)
--- a/testsuite/tools/simplify-data/test4.ui
+++ b/testsuite/tools/simplify-data/test4.ui
@@ -1,4 +1,4 @@
-<!-- irrelevant comments and context are stripped -->
+<!-- comments and context are preserved -->
 <interface>
   <object class="GtkWindow">
     <property name="visible" comments="foo" context="bla">True</property>

diff --git a/testsuite/tools/simplify-data/test5.expected b/testsuite/tools/simplify-data/test5.expected
index 1fb898bc0e7a5555ff8e6c0df0681df2be19786c..24b18f4a5278aa03b8d914ec03e361b470ee5d26 100644 (file)
--- a/testsuite/tools/simplify-data/test5.expected
+++ b/testsuite/tools/simplify-data/test5.expected
@@ -1,8 +1,11 @@
-<!-- placeholders are stripped -->
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow">
     <child>
       <object class="GtkBox">
+        <child>
+          <placeholder/>
+        </child>
       </object>
     </child>
   </object>

diff --git a/testsuite/tools/simplify-data/test5.ui b/testsuite/tools/simplify-data/test5.ui
index e379abdb2c5d46b0863fb2b2240fcd6fb8d1d49f..66ccb2016b2688c706fd39cc4bb1219a8304db0e 100644 (file)
--- a/testsuite/tools/simplify-data/test5.ui
+++ b/testsuite/tools/simplify-data/test5.ui
@@ -1,4 +1,4 @@
-<!-- placeholders are stripped -->
+<!-- placeholders are preserved -->
 <interface>
   <object class="GtkWindow">
     <child>

diff --git a/testsuite/tools/simplify-data/test6.expected b/testsuite/tools/simplify-data/test6.expected
index 8d4495b50e29fc09f5edbea932522b3e4bec9043..3ee19043ff1eb113efff809f4ba614195ab89d1c 100644 (file)
--- a/testsuite/tools/simplify-data/test6.expected
+++ b/testsuite/tools/simplify-data/test6.expected
@@ -1,5 +1,6 @@
-<!-- non-canonical property name works -->
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow">
+    <property name="default_height">200</property>
   </object>
 </interface>

diff --git a/testsuite/tools/simplify-data/test6.ui b/testsuite/tools/simplify-data/test6.ui
index e4f394dc218b956c9cac988dd1afcdd9fc3d7977..c0a5673f1070432ed6a1e50e6bf5e19b8d26ccdc 100644 (file)
--- a/testsuite/tools/simplify-data/test6.ui
+++ b/testsuite/tools/simplify-data/test6.ui
@@ -2,5 +2,6 @@
 <interface>
   <object class="GtkWindow">
     <property name="default_width">-1</property>
+    <property name="default_height">200</property>
   </object>
 </interface>

diff --git a/testsuite/tools/simplify-data/test7.expected b/testsuite/tools/simplify-data/test7.expected
index a75c4d4570be1991a289ef7fa30880ac31a2aa20..22f627bfa857fe76aa2dda3957266750f771f217 100644 (file)
--- a/testsuite/tools/simplify-data/test7.expected
+++ b/testsuite/tools/simplify-data/test7.expected
@@ -1,8 +1,12 @@
-<!-- default child property gets stripped -->
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <object class="GtkBox">
+  <object class="GtkGrid">
     <child>
-      <object class="GtkLabel"/>
+      <object class="GtkLabel">
+        <layout>
+          <property name="row-span">2</property>
+        </layout>
+      </object>
     </child>
   </object>
 </interface>

diff --git a/testsuite/tools/simplify-data/test7.ui b/testsuite/tools/simplify-data/test7.ui
index 52e0da2f4b46872751ab8e216417da46c79d4797..2b08eae6ad5c5ffff378b178b1f13932be345c9a 100644 (file)
--- a/testsuite/tools/simplify-data/test7.ui
+++ b/testsuite/tools/simplify-data/test7.ui
@@ -1,12 +1,13 @@
-<!-- default child property gets stripped -->
+<!-- default layout property gets stripped -->
 <interface>
-  <object class="GtkBox">
+  <object class="GtkGrid">
     <child>
       <object class="GtkLabel">
+        <layout>
+          <property name="column-span">1</property>
+          <property name="row-span">2</property>
+        </layout>
       </object>
-      <packing>
-        <property name="expand">False</property>
-      </packing>
     </child>
   </object>
 </interface>

diff --git a/testsuite/tools/simplify-data/test8.expected b/testsuite/tools/simplify-data/test8.expected
deleted file mode 100644 (file)
index df3c407..0000000
--- a/testsuite/tools/simplify-data/test8.expected
+++ /dev/null
@@ -1,11 +0,0 @@
-<!-- non-default child property remains -->
-<interface>
-  <object class="GtkBox">
-    <child>
-      <object class="GtkLabel"/>
-      <packing>
-        <property name="expand">1</property>
-      </packing>
-    </child>
-  </object>
-</interface>

diff --git a/testsuite/tools/simplify-data/test8.ui b/testsuite/tools/simplify-data/test8.ui
deleted file mode 100644 (file)
index 1aec7ad..0000000
--- a/testsuite/tools/simplify-data/test8.ui
+++ /dev/null
@@ -1,12 +0,0 @@
-<!-- non-default child property remains -->
-<interface>
-  <object class="GtkBox">
-    <child>
-      <object class="GtkLabel">
-      </object>
-      <packing>
-        <property name="expand">True</property>
-      </packing>
-    </child>
-  </object>
-</interface>

diff --git a/testsuite/tools/simplify-data/test9.expected b/testsuite/tools/simplify-data/test9.expected
deleted file mode 100644 (file)
index 731b05e..0000000
--- a/testsuite/tools/simplify-data/test9.expected
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <object class="GtkGrid">
-    <child>
-      <object class="GtkLabel">
-        <layout>
-          <property name="left-attach">0</property>
-          <property name="top-attach">0</property>
-        </layout>
-      </object>
-    </child>
-  </object>
-</interface>

diff --git a/testsuite/tools/simplify-data/test9.ui b/testsuite/tools/simplify-data/test9.ui
deleted file mode 100644 (file)
index b64bf8c..0000000
--- a/testsuite/tools/simplify-data/test9.ui
+++ /dev/null
@@ -1,13 +0,0 @@
-<!-- non-default child property remains -->
-<interface>
-  <object class="GtkGrid">
-    <child>
-      <object class="GtkLabel">
-        <layout>
-          <property name="left-attach">0</property>
-          <property name="top-attach">0</property>
-        </layout>
-      </object>
-    </child>
-  </object>
-</interface>